Cystoscopy and urethral dilatation